Skip to content

Don't put testing global.json in artifacts dir directly #49819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 18, 2025

Conversation

jkoritzinsky
Copy link
Member

Move testing into a subfolder under artifacts/tmp

Prevents interference between the testing global.json with Arcade's signing logic

Fixes dotnet/dotnet#1486

@jkoritzinsky jkoritzinsky requested review from mmitche and Copilot July 16, 2025 20:22
@jkoritzinsky jkoritzinsky requested a review from a team as a code owner July 16, 2025 20:22
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR moves testing-related files from being placed directly in the artifacts directory to a dedicated subfolder under artifacts/tmp/testing/. This change prevents interference between the testing global.json and Arcade's signing logic by isolating test artifacts from build artifacts.

Key changes:

  • Introduces a new TestLayoutDir property pointing to artifacts/tmp/testing/
  • Updates all MSBuild targets to use TestLayoutDir instead of ArtifactsTmpDir for test-related file operations
  • Modifies global.json generation to create files in both the artifacts bin directory and the new test layout directory

Reviewed Changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated no comments.

Show a summary per file
File Description
Directory.Build.props Introduces the new TestLayoutDir property
src/Layout/redist/targets/GenerateTestingGlobalJson.targets Updates global.json generation to target both artifacts bin and test layout directories
test/*.csproj and *.targets Updates all test project files to use TestLayoutDir instead of ArtifactsTmpDir
src/Containers/*.csproj Updates container-related projects to copy test files to the new test layout directory
template_feed/*.csproj Updates template projects to output to the new test layout directory

@baronfel
Copy link
Member

baronfel commented Jul 16, 2025

I expect this to break lots of tests - I think it had to go in that directory so that test usages would all work. WAIT you're a genius

@jkoritzinsky
Copy link
Member Author

@baronfel can you review when you have a chance? Should be ready for review now.

Copy link
Member

@baronfel baronfel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This definitely LGTM - @MiYanni may also be interested in having a gander.

@baronfel baronfel force-pushed the sdk-testing-globaljson branch from 6b5e113 to ca616c5 Compare July 17, 2025 22:53
Copy link
Member

@MiYanni MiYanni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting to use testing as the word for the folder name. But I'm cool with it. :shipit:

@jkoritzinsky jkoritzinsky merged commit 3e208f9 into dotnet:main Jul 18, 2025
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Failed to load hostpolicy.dll in signed builds
3 participants